Mark some patches as merged upstream
authorSimon McVittie <smcv@debian.org>
Tue, 14 Jun 2016 19:26:49 +0000 (15:26 -0400)
committerSimon McVittie <smcv@debian.org>
Tue, 14 Jun 2016 19:26:49 +0000 (15:26 -0400)
debian/patches/test-parent-this-test-requires-user-xattrs.patch
debian/patches/test-sysroot.js-set-strict-mode-when-sourcing-libtest.sh.patch

index 825341e010115dc157fb4f70ea0d799505f652bc..c06994b23390d00178b5f95e0b10cc2f544129df 100644 (file)
@@ -3,6 +3,7 @@ Date: Mon, 25 Apr 2016 12:50:32 +0100
 Subject: test-parent: this test requires user xattrs
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
+Applied-upstream: 2016.6, commit:542df553e2c51a9d2f9cfc4212dfd996f54b3f8b
 ---
  tests/test-parent.sh | 2 ++
  1 file changed, 2 insertions(+)
index b31f7656bfe49a0253004d738d4faeda2ee9d4b6..365f56f46733f733431794fdbb22d79c0b2fd3fc 100644 (file)
@@ -7,6 +7,7 @@ fails as soon as something goes wrong.
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
 Forwarded: https://github.com/ostreedev/ostree/pull/335
+Applied-upstream: 2016.6, commit:0cf0fa815414eebb3e642429085fa75dda05c24d
 ---
  tests/test-sysroot.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)